From 58bef3a4640c4ff5ee26df2ecf95d2d9c03591e2 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 3 Sep 2014 14:22:10 +0200
Subject: [PATCH] Adwaita: parametric bottom edge color for buttons

---
 gtk/resources/theme/Adwaita/_common.scss      | 148 +++++++++---------
 gtk/resources/theme/Adwaita/_drawing.scss     |  43 +++--
 .../theme/Adwaita/gtk-contained-dark.css      |  86 +++++-----
 gtk/resources/theme/Adwaita/gtk-contained.css |  64 ++++----
 4 files changed, 174 insertions(+), 167 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 73c0300565..33a5021daf 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -586,21 +586,23 @@ $_dot_color: if($variant=='light', $selected_bg_color,
 // should really be deprecated...
 .inline-toolbar GtkToolButton > .button { // redefining the button look is
                                           // needed since those are flat...
-  @include button(normal, $noedge: true); // the box-shadow outset doesn't work
-                                          // in this case, hence $noedge
-  &:hover { @include button(hover, $noedge: true); }
-  &:active { @include button(active, $noedge:true); }
-  &:checked{ @include button(active, $noedge:true); }
-  &:insensitive { @include button(insensitive, $noedge:true); }
-  &:insensitive:active { @include button(insensitive-active, $noedge:true); }
-  &:insensitive:checked { @include button(insensitive-active, $noedge:true); }
-  &:backdrop { @include button(backdrop); };
-  &:backdrop:active { @include button(backdrop-active); }
-  &:backdrop:checked { @include button(backdrop-active); }
-  &:backdrop:insensitive { @include button(backdrop-insensitive); }
-  &:backdrop:insensitive:active { @include button(backdrop-insensitive-active);}
-  &:backdrop:insensitive:checked { @include button(backdrop-insensitive-active);}
-}
+  @include button(normal, $edge:none);    // the box-shadow outset doesn't work
+                                          // in this case, hence $edge: none
+  &:hover { @include button(hover, $edge:none); }
+  &:active { @include button(active, $edge:none); }
+  &:checked{ @include button(active, $edge:none); }
+  &:insensitive { @include button(insensitive, $edge:none); }
+  &:insensitive:active { @include button(insensitive-active, $edge:none); }
+  &:insensitive:checked { @include button(insensitive-active, $edge:none); }
+  &:backdrop { @include button(backdrop, $edge:none); };
+  &:backdrop:active { @include button(backdrop-active, $edge:none); }
+  &:backdrop:checked { @include button(backdrop-active, $edge:none); }
+  &:backdrop:insensitive { @include button(backdrop-insensitive, $edge:none); }
+  &:backdrop:insensitive:active {
+    @include button(backdrop-insensitive-active, $edge:none); }
+  &:backdrop:insensitive:checked {
+    @include button(backdrop-insensitive-active, $edge:none); }
+} 
 .inline-toolbar.toolbar GtkToolButton,
 .inline-toolbar.toolbar GtkToolButton:backdrop { // .inline-toolbar.toolbar here for
                                                  // higher specificity than the
@@ -760,22 +762,22 @@ GtkColorButton.button {
       padding-bottom: 8px; //
       &:first-child {
         @extend %top_button;
-        @include button(normal, $noedge: true);
+        @include button(normal, $edge:none);
         &:active {
           @extend %top_button;
-          @include button(active, $noedge: true);
+          @include button(active, $edge:none);
         }
         &:hover {
           @extend %top_button;
-          @include button(hover, $noedge: true);
+          @include button(hover, $edge:none);
         }
         &:insensitive {
           @extend %top_button;
-          @include button(insensitive, $noedge: true);
+          @include button(insensitive, $edge:none);
         }
         &:backdrop {
           @extend %top_button;
-          @include button(backdrop);
+          @include button(backdrop, $edge:none);
         }
       }
       &:last-child {
@@ -1000,43 +1002,43 @@ GtkComboBox {
     }
     .subtitle:link { @extend *:link:selected;  }
     .button {
-      @include button(normal, $selected_bg_color, $selected_fg_color, noedge);
+      @include button(normal, $selected_bg_color, $selected_fg_color, none);
       &:hover { @include button(hover, $selected_bg_color, $selected_fg_color,
-                                $noedge: true); }
-      &:active, &:checked { @include button(active, $selected_bg_color, $selected_fg_color,
-                                            $noedge: true); }
+                                none); }
+      &:active,
+      &:checked { @include button(active, $selected_bg_color,
+                                  $selected_fg_color, none); }
       &:insensitive { @include button(insensitive, $selected_bg_color,
-                                      $selected_fg_color, $noedge: true); }
+                                      $selected_fg_color, none); }
       &:backdrop {
-        @include button(backdrop, $selected_bg_color, $selected_fg_color,
-                        $noedge: true);
+        @include button(backdrop, $selected_bg_color, $selected_fg_color, none);
         border-color: $selected_borders_color;
       }
       &:backdrop:insensitive {
         @include button(backdrop-insensitive, $selected_bg_color,
-                        $selected_fg_color, $noedge: true);
+                        $selected_fg_color, none);
       }
       &.suggested-action {
-        @include button(normal, $noedge:true);
+        @include button(normal, $edge:none);
         border-color: $selected_borders_color;
         &:hover {
-          @include button(hover, $noedge: true);
+          @include button(hover, $edge:none);
           border-color: $selected_borders_color;
         }
         &:active {
-          @include button(active, $noedge: true);
+          @include button(active, $edge:none);
           border-color: $selected_borders_color;
         }
         &:insensitive {
-          @include button(insensitive, $noedge: true);
+          @include button(insensitive, $edge:none);
           border-color: $selected_borders_color;
         }
         &:backdrop {
-          @include button(backdrop, $noedge: true);
+          @include button(backdrop, $edge:none);
           border-color: $selected_borders_color;
         }
         &:backdrop:insensitive {
-          @include button(backdrop-insensitive, $noedge: true);
+          @include button(backdrop-insensitive, $edge:none);
           border-color: $selected_borders_color;
         }
       }
@@ -1542,12 +1544,12 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
       color: transparentize($fg_color,0.7);
       &:hover {
         color:  $fg_color;
-        @include button(hover, $noedge: true);
+        @include button(hover, $edge:none);
         background-image: none;
         box-shadow: none;
       }
       &:active {
-        @include button(active, $noedge: true);
+        @include button(active, $edge:none);
       }
       &:backdrop {
         color: transparentize($backdrop_fg_color,0.7);
@@ -1691,27 +1693,30 @@ GtkSwitch {
   .list-row:selected &.slider {
     border: 1px solid;
     border-radius: 3px;
-    @include button(normal, $noedge: true);
+    @include button(normal);
     box-shadow: inset 0 1px if($variant=='light', white,
                                transparentize(white,0.85)),
                 inset 0 -2px transparentize($bg_color,0.4),
                 inset 0 -1px mix($bg_color,$borders_color,50%);
     &:hover {
-      @include button(hover, $noedge: true);
+      @include button(hover);
       box-shadow: inset 0 1px if($variant=='light', white,
                                  transparentize(white,0.85)),
                   inset 0 -2px transparentize($bg_color,0.4),
                   inset 0 -1px mix($bg_color,$borders_color,50%);
     }
     &:active { border: 1px solid $selected_borders_color; }
-    &:insensitive { @include button(insensitive, $noedge: true); }
-    &:backdrop { @include button(backdrop);
+    &:insensitive { @include button(insensitive, $edge:none); }
+    &:backdrop {
+      @include button(backdrop);
+      box-shadow: none;
       &:active{
         border-color: if($variant == 'light', $selected_bg_color,
                                               $selected_borders_color);
       }
       &:insensitive {
         @include button(backdrop-insensitive);
+        box-shadow: none;
       }
     }
   }
@@ -1838,7 +1843,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   }
   &.slider {
     //FIXME: better gradient on the slider and hover state
-    @include button(normal, $noedge: true);
+    @include button(normal);
     border: 1px solid;
     border-radius: 50%;
     border-color: darken($borders_color,3%);
@@ -1847,7 +1852,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
                 inset 0 #{-2px} $bg_color,
                 inset 0 #{-1px} mix($bg_color,$borders_color,50%);
     &:hover {
-      @include button(hover, $noedge: true);
+      @include button(hover);
       border-color: darken($borders_color,3%);
       border-radius: 50%; // needed for double marks scales
       box-shadow: inset 0 1px if($variant=='light', white,
@@ -2219,42 +2224,42 @@ GtkScrolledWindow {
 .list-row:selected {
   @extend %selected_items;
   .button {
-    @include button(normal, $noedge:true);
+    @include button(normal, $edge:none);
     @if $variant == 'light' { border-color: $selected_borders_color; }
     &:hover, &.flat:hover {
-      @include button(hover, $noedge:true);
+      @include button(hover, $edge:none);
       @if $variant == 'light' { border-color: $selected_borders_color; }
     }
     &:active, &.flat:active,
     &:checked, &.flat:checked {
-      @include button(active, $noedge:true);
+      @include button(active, $edge:none);
       @if $variant == 'light' { border-color: $selected_borders_color; }
     }
     &:backdrop {
-      @include button(backdrop, $noedge:true);
+      @include button(backdrop, $edge:none);
       @if $variant == 'light' { border-color: $selected_borders_color; }
       &:active, &:checked {
-        @include button(backdrop-active, $noedge:true);
+        @include button(backdrop-active, $edge:none);
         @if $variant == 'light' { border-color: $selected_borders_color; }
       }
       &:insensitive {
-        @include button(backdrop-insensitive, $noedge:true);
+        @include button(backdrop-insensitive, $edge:none);
         @if $variant == 'light' { border-color: $selected_borders_color; }
       }
       &:insensitive:active {
-        @include button(backdrop-insensitive-active, $noedge:true);
+        @include button(backdrop-insensitive-active, $edge:none);
         @if $variant == 'light' { border-color: $selected_borders_color; }
       }
     }
     &:insensitive {
-      @include button(insensitive, $noedge:true);
+      @include button(insensitive, $edge:none);
       @if $variant == 'light' { border-color: $selected_borders_color; }
     }
     &.flat, &.flat:backdrop, &.flat:backdrop:insensitive {
       @extend %undecorated_button;
     }
     //FIXME: make placeholder with buttons w/o edge to be extended around
-    // istead of repeating everytime this stuff.
+    //       istead of repeating everytime this stuff.
   }
 }
 
@@ -2374,51 +2379,51 @@ GtkCalendar {
     .dialog-action-area .button {
       padding: 12px;
       border-radius: 0;
-      @include button(normal, $noedge: true);
+      @include button(normal, $edge:none);
       @extend %middle_button;
       &:hover {
-        @include button(hover, $noedge: true);
+        @include button(hover, $edge:none);
         @extend %middle_button;
       }
       &:active {
-        @include button(active, $noedge: true);
+        @include button(active, $edge:none);
         @extend %middle_button;
       }
       &:insensitive {
-        @include button(insensitive, $noedge: true);
+        @include button(insensitive, $edge:none);
         @extend %middle_button;
       }
       &:backdrop {
-        @include button(backdrop, $noedge: true);
+        @include button(backdrop, $edge:none);
         @extend %middle_button;
       }
       &:backdrop:insensitive {
-        @include button(backdrop-insensitive, $noedge: true);
+        @include button(backdrop-insensitive, $edge:none);
         @extend %middle_button;
       }
       @each $b_type, $b_color in (suggested-action, $selected_bg_color),
                                  (destructive-action, $destructive_color) {
         &.#{$b_type} {
-          @include button(normal, $b_color, white, $noedge: true);
+          @include button(normal, $b_color, white, $edge:none);
           @extend %middle_button;
           &:hover {
-            @include button(hover, $b_color, white, $noedge: true);
+            @include button(hover, $b_color, white, $edge:none);
             @extend %middle_button;
           }
           &:active {
-            @include button(active, $b_color, white, $noedge: true);
+            @include button(active, $b_color, white, $edge:none);
             @extend %middle_button;
           }
           &:backdrop {
-            @include button(backdrop, $b_color, white);
+            @include button(backdrop, $b_color, white, $edge:none);
             @extend %middle_button;
             &:insensitive {
-              @include button(backdrop-insensitive);
+              @include button(backdrop-insensitive, $edge:none);
               @extend %middle_button;
             }
           }
           &:insensitive {
-            @include button(insensitive);
+            @include button(insensitive, $edge:none);
             @extend %middle_button;
           }
         }
@@ -2432,7 +2437,7 @@ GtkCalendar {
       border-bottom-style: none;
     }
     %last_button { 
-      border-bottom-right-radius: 7px; 
+      border-bottom-right-radius: 7px;
     }
     %first_button {
       border-left-style: none;
@@ -2521,18 +2526,19 @@ GtkInfoBar {
   text-shadow: 0 1px darken($selected_bg_color, 10%);
   border-color: darken($selected_bg_color, 10%);
   .button {
-    @include button(normal, $selected_bg_color, $selected_fg_color, $noedge: true);
-    &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, $noedge: true); }
-    &:active { @include button(active, $selected_bg_color, $selected_fg_color, $noedge: true); }
+    @include button(normal, $selected_bg_color, $selected_fg_color, none);
+    &:hover {
+      @include button(hover, $selected_bg_color, $selected_fg_color, none); }
+    &:active {
+      @include button(active, $selected_bg_color, $selected_fg_color, none); }
     &:insensitive {
-      @include button(insensitive, $selected_bg_color, $selected_fg_color, $noedge: true);
-    }
+      @include button(insensitive,$selected_bg_color,$selected_fg_color,none); }
     &:backdrop {
-      @include button(backdrop, $selected_bg_color, $selected_fg_color);
+      @include button(backdrop, $selected_bg_color, $selected_fg_color, none);
       border-color: _border_color($selected_bg_color);
       &:insensitive {
         @include button(backdrop-insensitive, $selected_bg_color,
-                                              $selected_fg_color, $noedge: True);
+                        $selected_fg_color, none);
         border-color: _border_color($selected_bg_color);
       }
     }
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index 2e46a95c72..9ff385fb8b 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -130,14 +130,15 @@
   }
 }
 
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $noedge:false) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
-// $t:  button type,
-// $c:  base button color for colored* types
-// $tc: optional text color for colored* types
-// $noedge: set to true not to draw the bottom edge hilight
+// $t:    button type,
+// $c:    base button color for colored* types
+// $tc:   optional text color for colored* types
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
@@ -147,6 +148,9 @@
 
   $_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons
 
+  $_button_edge: if($edge == none, none, widget_edge($edge));
+  $_blank_edge: if($edge == none, none, widget_edge(transparentize($edge,1)));
+
   @if $t==normal {
   //
   // normal button
@@ -162,8 +166,7 @@
     @else { border-color: $borders_color; }
 
     @include _button_text_shadow($tc,$c);
-    $_outsets: if($noedge, none, widget_edge());
-    @include _shadows(inset 0 1px $_top_hilight, $_outsets);
+    @include _shadows(inset 0 1px $_top_hilight, $_button_edge);
   }
 
   @else if $t==hover {
@@ -179,8 +182,7 @@
                                       $c);
 
     @include _button_text_shadow($tc,lighten($c,4%));
-    $_outsets: if($noedge, none, widget_edge());
-    @include _shadows(inset 0 1px $_top_hilight, $_outsets);
+    @include _shadows(inset 0 1px $_top_hilight, $_button_edge);
   }
 
   @else if $t==active {
@@ -194,10 +196,9 @@
                                       darken($c,9%),
                                       darken($c,5%));
     @include _button_text_shadow($tc,darken($c,10%));
-    $_outsets: if($noedge, none, widget_edge());
     @include _shadows(inset 0 1px transparentize(black, 0.93),
                       inset 0 2px 1px -2px transparentize(black,0.4),
-                      $_outsets);
+                      $_button_edge);
   }
   @else if $t==insensitive {
   //
@@ -210,10 +211,9 @@
     background-image: linear-gradient(to bottom, $_bg);
     text-shadow: none;
     icon-shadow: none;
-    $_outsets: if($noedge, none, widget_edge());
     // white with 0 alpha to avoid an ugly transition, since no color means
     // black with 0 alpha
-    @include _shadows(inset 0 1px transparentize(white,1), $_outsets);
+    @include _shadows(inset 0 1px transparentize(white,1), $_button_edge);
     > GtkLabel { color: inherit; }
   }
   @else if $t==insensitive-active {
@@ -227,10 +227,9 @@
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
     background-image: linear-gradient(to bottom, mix($_bc, $_bg, 10%), $_bg);
-    $_outsets: if($noedge, none, widget_edge());
     // white with 0 alpha to avoid an ugly transition, since no color means
     // black with 0 alpha
-    @include _shadows(inset 0 1px transparentize(white,1), $_outsets);
+    @include _shadows(inset 0 1px transparentize(white,1), $_button_edge);
     > GtkLabel { color: inherit; }
   }
 
@@ -252,7 +251,7 @@
     text-shadow: none;
     icon-shadow: none;
     @include _shadows(inset 0 1px transparentize(white,1),
-                            0 1px transparentize(white,1));
+                      $_blank_edge);
   }
 
   @else if $t==backdrop-active {
@@ -262,16 +261,14 @@
     color: $backdrop_fg_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_dark_fill);
-    box-shadow: inset 0 1px transparentize(white,1),
-                0 1px transparentize(white,1);
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
   }
 
   @else if $t==backdrop-insensitive {
   //
   // backdrop insensitive button
   //
-    //box-shadow: inset 0 1px transparentize(white,1),
-    //            0 1px transparentize(white,1);
 
     $_bg: if($c!=$bg_color, mix($c,$base_color,85%), $insensitive_bg_color);
     color: if($c!=$bg_color, mix($tc,$_bg,35%), $backdrop_insensitive_color);
@@ -282,7 +279,7 @@
     // white with 0 alpha to avoid an ugly transition, since no color means
     // black with 0 alpha
     @include _shadows(inset 0 1px transparentize(white,1),
-                            0 1px transparentize(white,1));
+                      $_blank_edge);
     > GtkLabel { color: inherit; }
   }
 
@@ -294,8 +291,8 @@
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom,
                         mix($backdrop_borders_color,$insensitive_bg_color, 8%));
-    box-shadow: inset 0 1px transparentize(white,1),
-                0 1px transparentize(white,1);
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
     > GtkLabel { color: inherit; }
   }
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 86d21bf12b..0b0dfaf64c 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -311,27 +311,27 @@ GtkFlowBox .grid-child {
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
     .button:backdrop:active, .button:backdrop:checked {
       color: #c9cbc9;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .button:backdrop:insensitive {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
     .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #303434);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button:backdrop:insensitive:active > GtkLabel, .button:backdrop:insensitive:checked > GtkLabel {
         color: inherit; }
   .button:insensitive {
@@ -491,14 +491,14 @@ GtkFlowBox .grid-child {
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button.suggested-action:backdrop:insensitive {
         color: #5d6767;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
         .button.suggested-action:backdrop:insensitive > GtkLabel {
           color: inherit; }
     .button.suggested-action:insensitive {
@@ -573,14 +573,14 @@ GtkFlowBox .grid-child {
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button.destructive-action:backdrop:insensitive {
         color: #5d6767;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
         .button.destructive-action:backdrop:insensitive > GtkLabel {
           color: inherit; }
     .button.destructive-action:insensitive {
@@ -736,38 +736,38 @@ GtkFlowBox .grid-child {
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:active {
     color: #c9cbc9;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2f3434);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:checked {
     color: #c9cbc9;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2f3434);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
     color: #5d6767;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
     color: #5d6767;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #303434);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
     color: #5d6767;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #303434);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel {
       color: inherit; }
 
@@ -1045,7 +1045,7 @@ GtkColorButton.button {
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child {
       color: #eeeeec;
       background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
@@ -1082,14 +1082,14 @@ GtkColorButton.button {
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .spinbutton.vertical .button:backdrop:insensitive, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .spinbutton.vertical .button:backdrop:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
   .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry {
@@ -1262,7 +1262,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0f2b48; }
       .titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header .button:backdrop:insensitive,
       .header-bar.selection-mode .button:backdrop:insensitive {
@@ -1271,7 +1271,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .titlebar.selection-mode .button:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:backdrop:insensitive > GtkLabel,
         .header-bar.selection-mode .button:backdrop:insensitive > GtkLabel {
           color: inherit; }
@@ -1321,7 +1321,7 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
@@ -1330,7 +1330,7 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
           .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive > GtkLabel,
           .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel {
@@ -1951,7 +1951,7 @@ GtkSwitch {
     border-color: #1c1f1f;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
     GtkSwitch.slider:hover, .list-row:selected GtkSwitch.slider:hover {
       color: #eeeeec;
@@ -1959,7 +1959,7 @@ GtkSwitch {
       background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
     GtkSwitch.slider:active, .list-row:selected GtkSwitch.slider:active {
       border: 1px solid #0f2b48; }
@@ -1978,7 +1978,8 @@ GtkSwitch {
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+      box-shadow: none; }
       GtkSwitch.slider:backdrop:active, .list-row:selected GtkSwitch.slider:backdrop:active {
         border-color: #0f2b48; }
       GtkSwitch.slider:backdrop:insensitive, .list-row:selected GtkSwitch.slider:backdrop:insensitive {
@@ -1987,7 +1988,8 @@ GtkSwitch {
         background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+        box-shadow: none; }
         GtkSwitch.slider:backdrop:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:backdrop:insensitive > GtkLabel {
           color: inherit; }
 
@@ -2394,7 +2396,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-color: #1c1f1f;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     border: 1px solid;
     border-radius: 50%;
     border-color: #151717;
@@ -2407,7 +2409,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
       border-color: #151717;
       border-radius: 50%;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(255, 255, 255, 0.14), inset 0 -1px #303535; }
@@ -2434,7 +2436,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .scale.slider:backdrop:insensitive > GtkLabel,
       .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel,
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > GtkLabel {
@@ -3000,26 +3002,26 @@ GtkScrolledWindow GtkViewport.frame {
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
       color: #c9cbc9;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .list-row:selected .button:backdrop:insensitive {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .list-row:selected .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
     .list-row:selected .button:backdrop:insensitive:active {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #303434);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .list-row:selected .button:backdrop:insensitive:active > GtkLabel {
         color: inherit; }
   .list-row:selected .button:insensitive {
@@ -3190,14 +3192,14 @@ GtkCalendar {
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
       color: #5d6767;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action {
@@ -3227,14 +3229,14 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
           color: #5d6767;
           border-color: #1e2222;
           background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
           .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > GtkLabel {
             color: inherit; }
       .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
@@ -3243,7 +3245,7 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > GtkLabel {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action {
@@ -3273,14 +3275,14 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #d51010);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
           color: #5d6767;
           border-color: #1e2222;
           background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
           .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > GtkLabel {
             color: inherit; }
       .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
@@ -3289,7 +3291,7 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > GtkLabel {
           color: inherit; }
   .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
@@ -3419,7 +3421,7 @@ GtkInfoBar {
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #0b1e33; }
       .info .button:backdrop:insensitive,
       .question .button:backdrop:insensitive,
@@ -3430,7 +3432,7 @@ GtkInfoBar {
         background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
         .info .button:backdrop:insensitive > GtkLabel,
         .question .button:backdrop:insensitive > GtkLabel,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 723048db06..83345bb738 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -728,38 +728,38 @@ GtkFlowBox .grid-child {
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:active {
     color: #54595a;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #d4d4d4);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:checked {
     color: #54595a;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #d4d4d4);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
     color: #c7c7c7;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
     color: #c7c7c7;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
     color: #c7c7c7;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel {
       color: inherit; }
 
@@ -1037,7 +1037,7 @@ GtkColorButton.button {
         background-image: linear-gradient(to bottom, #ededed);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child {
       color: #2e3436;
       background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
@@ -1254,7 +1254,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
       .titlebar.selection-mode .button:backdrop:insensitive, GtkCalendar.selection-mode.header .button:backdrop:insensitive,
       .header-bar.selection-mode .button:backdrop:insensitive {
@@ -1263,7 +1263,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .titlebar.selection-mode .button:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button:backdrop:insensitive > GtkLabel,
         .header-bar.selection-mode .button:backdrop:insensitive > GtkLabel {
           color: inherit; }
@@ -1313,7 +1313,7 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
@@ -1322,7 +1322,7 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
           .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel, GtkCalendar.selection-mode.header .button.suggested-action:backdrop:insensitive > GtkLabel,
           .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > GtkLabel {
@@ -1946,7 +1946,7 @@ GtkSwitch {
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 1px white;
+    box-shadow: inset 0 1px white, 0 1px white;
     box-shadow: inset 0 1px white, inset 0 -2px rgba(237, 237, 237, 0.6), inset 0 -1px #c7c7c7; }
     GtkSwitch.slider:hover, .list-row:selected GtkSwitch.slider:hover {
       color: #2e3436;
@@ -1954,7 +1954,7 @@ GtkSwitch {
       background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
       text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-      box-shadow: inset 0 1px white;
+      box-shadow: inset 0 1px white, 0 1px white;
       box-shadow: inset 0 1px white, inset 0 -2px rgba(237, 237, 237, 0.6), inset 0 -1px #c7c7c7; }
     GtkSwitch.slider:active, .list-row:selected GtkSwitch.slider:active {
       border: 1px solid #184472; }
@@ -1973,7 +1973,8 @@ GtkSwitch {
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: none; }
       GtkSwitch.slider:backdrop:active, .list-row:selected GtkSwitch.slider:backdrop:active {
         border-color: #4a90d9; }
       GtkSwitch.slider:backdrop:insensitive, .list-row:selected GtkSwitch.slider:backdrop:insensitive {
@@ -1982,7 +1983,8 @@ GtkSwitch {
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        box-shadow: none; }
         GtkSwitch.slider:backdrop:insensitive > GtkLabel, .list-row:selected GtkSwitch.slider:backdrop:insensitive > GtkLabel {
           color: inherit; }
 
@@ -2533,7 +2535,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 1px white;
+    box-shadow: inset 0 1px white, 0 1px white;
     border: 1px solid;
     border-radius: 50%;
     border-color: #999999;
@@ -2546,7 +2548,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
       text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-      box-shadow: inset 0 1px white;
+      box-shadow: inset 0 1px white, 0 1px white;
       border-color: #999999;
       border-radius: 50%;
       box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d6d6d6; }
@@ -3142,13 +3144,13 @@ GtkScrolledWindow GtkViewport.frame {
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
     .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
       color: #54595a;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #d4d4d4);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     .list-row:selected .button:backdrop:insensitive {
       color: #c7c7c7;
@@ -3156,7 +3158,7 @@ GtkScrolledWindow GtkViewport.frame {
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
       .list-row:selected .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
@@ -3164,7 +3166,7 @@ GtkScrolledWindow GtkViewport.frame {
       color: #c7c7c7;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
       .list-row:selected .button:backdrop:insensitive:active > GtkLabel {
         color: inherit; }
@@ -3337,14 +3339,14 @@ GtkCalendar {
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
       color: #c7c7c7;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > GtkLabel {
         color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action {
@@ -3374,14 +3376,14 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
           border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
           .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > GtkLabel {
             color: inherit; }
       .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
@@ -3390,7 +3392,7 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > GtkLabel {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action {
@@ -3420,14 +3422,14 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #ef2929);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
           color: #c7c7c7;
           border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
           .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > GtkLabel {
             color: inherit; }
       .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
@@ -3436,7 +3438,7 @@ GtkCalendar {
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > GtkLabel {
           color: inherit; }
   .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
@@ -3566,7 +3568,7 @@ GtkInfoBar {
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #1c5187; }
       .info .button:backdrop:insensitive,
       .question .button:backdrop:insensitive,
@@ -3577,7 +3579,7 @@ GtkInfoBar {
         background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
         .info .button:backdrop:insensitive > GtkLabel,
         .question .button:backdrop:insensitive > GtkLabel,
-- 
2.30.2